From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 22 Aug 2007 16:15:00 +0000 (+0000)
Subject: rename libtool macros, revert [8461], make install prefix configurable in libtool_fix... 
X-Git-Tag: kamikaze_7.07~4
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22%24PHP_SELF/%22https:/collectd.org/%22%24PHP_SELF?a=commitdiff_plain;h=03089449054ed79b25eaedf2b305389f20a68801;p=openwrt%2Fsvn-archive%2Fopenwrt.git

rename libtool macros, revert [8461], make install prefix configurable in libtool_fixup_libdir

SVN-Revision: 8462
---

diff --git a/include/package.mk b/include/package.mk
index b99f0c74cb..1f4d8878ec 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -103,15 +103,15 @@ endif
 endef
 
 # prevent libtool from setting rpath when linking
-define Build/Fix/libtool/rpath
+define libtool_disable_rpath
 	find $(PKG_BUILD_DIR) -name 'libtool' | xargs \
 		$(SED) 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ ",g'
 endef
 
 # prevent libtool from linking against host development libraries
-define Build/Fix/libtool/libdir
+define libtool_fixup_libdir
 	find $(PKG_BUILD_DIR) -name '*.la' | xargs \
-		$(SED) "s,^libdir='/usr/lib',libdir='$(STAGING_DIR)/usr/lib',g"
+		$(SED) "s,^libdir='/usr/lib',libdir='$(strip $(1))/usr/lib',g"
 endef
 
 define Build/Prepare